Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 24 Jul 2011 07:10:35 +0000 (00:10 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 24 Jul 2011 07:10:35 +0000 (00:10 -0700)

Trivial merge